diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2022-06-16 02:00:29 +0200 |
|---|---|---|
| committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2022-10-06 21:00:53 +0200 |
| commit | 1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856 (patch) | |
| tree | 19e12b3dcba0bc1057a8864dcbe1a7d0b2c74de1 | |
| parent | Vulkan Swapchain: Overall improvements. (diff) | |
| download | yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.tar yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.tar.gz yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.tar.bz2 yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.tar.lz yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.tar.xz yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.tar.zst yuzu-1a9b71b1c6a5b6fb2a41fc485a986e9c505b2856.zip | |
| -rw-r--r-- | src/common/address_space.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/address_space.inc b/src/common/address_space.inc index 907c55d88..e1241d099 100644 --- a/src/common/address_space.inc +++ b/src/common/address_space.inc @@ -30,9 +30,9 @@ FlatAllocator<VaType, UnmappedVa, AddressSpaceBits> namespace Common { -MAP_MEMBER_CONST()::FlatAddressSpaceMap(VaType vaLimit, - std::function<void(VaType, VaType)> unmapCallback) - : unmapCallback(std::move(unmapCallback)), vaLimit(vaLimit) { +MAP_MEMBER_CONST()::FlatAddressSpaceMap(VaType vaLimit_, + std::function<void(VaType, VaType)> unmapCallback_) + : unmapCallback(std::move(unmapCallback_)), vaLimit(vaLimit_) { if (vaLimit > VaMaximum) UNREACHABLE_MSG("Invalid VA limit!"); } @@ -261,8 +261,8 @@ MAP_MEMBER(void)::UnmapLocked(VaType virt, VaType size) { unmapCallback(virt, size); } -ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart, VaType vaLimit) - : Base(vaLimit), currentLinearAllocEnd(vaStart), vaStart(vaStart) {} +ALLOC_MEMBER_CONST()::FlatAllocator(VaType vaStart_, VaType vaLimit) + : Base(vaLimit), currentLinearAllocEnd(vaStart_), vaStart(vaStart_) {} ALLOC_MEMBER(VaType)::Allocate(VaType size) { std::scoped_lock lock(this->blockMutex); |